Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 25 Apr 2010 00:34:57 +0000 (02:34 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 25 Apr 2010 00:34:57 +0000 (02:34 +0200)
commit899c4d089e81d31e2915310c09f75dac8e3e699c
tree9fa31222ede94189be647bd11b2a807cf67ebbc4
parentf964f0e226874db4f53d523153694d00504e0784
parentcc2cc104f9b1addb0b00b4f97de3f156468dfbfb
Merge branch 'upstream'